Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours
am: 8f09557150  -s ours

Change-Id: I238486086c8b806593e241a8c1a6f070fdcf060d