Merge changes  into stage-aosp-master am: fc32974de5
am: 32d675e990

Change-Id: I89aab101881f2b1d835c8c8814336e714fa9ab17