Merge changes I3cd68e65,I837596e4
am: 01b3b33248

Change-Id: Ibb421bdc746b85e11c38caa509fa214c162a61d5