Merge changes I12b38fa5,Ia11195b1
am: 8aa2b1dffd

Change-Id: I2ac308ac94fd49298641c1230e731c1406913281