Merge changes I5c32ab58,Ie480f9d6
am: 5a0706d429

Change-Id: I6834ea8dd31f12934abf71d406a4f1eb7c460dae