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

Change-Id: Id478a74c494ac6324397ff7e1b2e6922656d0c52