Merge changes  into stage-aosp-master
am: 8758b9462e

Change-Id: I63acb13055109fc08fbe77d4dd6ebd68daeaabcd