Merge changes I481fbbc7,I57e48b5d,Ieb52489b,I2763ddd9
am: 4a0bf07492

Change-Id: I91b5f045365193279889c1e8a68576eda11c4266