Merge changes  into stage-aosp-master am: f35a53afa2
am: e68a635545

Change-Id: Ib1cab07ba9e0d0c52680f7e2f81b117fd0e231d1