(This is a merge of http://go/wvgerrit/26221) We have agreed on API 26 for O, so these comments can be removed without making any further changes. Bug: 34548395 Test: This is a comment-only change. But I verified it builds. Change-Id: I490befba4f47902a84b60e562a7a5eb162a9f3be