Merge changes Ic2da319f,I9e90029d
am: 4c154d593a

Change-Id: I929c34d559103847d028fc431185043402f48fa8