Merge changes from topic "am-092cc1f452cb4dc6aef4ca1c3d400ae5" into stage-aosp-master
am: 8be009d431

Change-Id: I840d591f0fd5b99b3ba84051a1ec07c2d7045e23