Bug: 186788640 Bug: 187766150 Test: Compiles Change-Id: I6b67c2f7243c50c83cb159c50519a318892f6941 Merged-In: I6b67c2f7243c50c83cb159c50519a318892f6941 (cherry picked from commit 3d8a9d18)