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

Change-Id: Ib857b990a0938889b134228d78a32398a72be102