Merge changes  into stage-aosp-master am: 680f735ef1
am: 9e9c3b1dc0

Change-Id: I30ae82f0c51c2c47474dcfc44de32fea1153a4cf