Merge changes If970d851,I5bd11574
am: 3c054697fc

Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e