Merge changes Ic48ccda9,Ibc0a29c9
am: 5504aef8c1

Change-Id: I91bfff928424f2c41437303b6b2c6a07788ca8d7