Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bb
am: 7a2519030a

Change-Id: I82e1ff121681acbe225e45967b7e46a8bd0146ef