Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6

Partial cherry-pick of commit 7ad1110ecd6a840fcd2895c62668828a1ca029c6.

Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d
1 file changed