Merge changes I494af5b7,Ib32f140d am: b05873e5ac
am: 1f5c1545fc

Change-Id: I65f365c348d3f7e9b05621ca458f92b9c59f3980