DO NOT MERGE: manually cherry pick Change-Id: Id72e3921603f95aae673ca17f77db96cd633210d Test: presubmit Bug: n/a Ignore-AOSP-First: manually cherry pick