Merge changes  into stage-aosp-master am: 39c76107bd
am: b548208bcb

Change-Id: Ib5bf516476d00ebdf985066480ceaa7499992b42