Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3
am: ff54f522a6

Change-Id: Ic4317f9edf1ca8a1d9d47f53805c57a6ed63ba65