Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours am: 8f09557150 -s ours
am: 036989452d -s ours
Change-Id: Ife759ebe7c4849d597406bc5f9608cc8a344dc92
This commit is contained in: