Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master
am: 41d6995efa

Change-Id: I49343d3ee533b8b567edf2c76b9fbc78ad2cd235