Merge changes I55d0e1a8,I4d9a8776
am: 370aac75ea

Change-Id: I90a8da2f2625e051187f80e74f45f2df7a0d68ea