Merge changes I12b38fa5,Ia11195b1 am: 8aa2b1dffd
am: 1c2e3a181d

Change-Id: I5cd221c7e4754fd4651d8c7c29b567b57fb0960d