Merge changes I6a842960,If618c26b
am: 7920502065

Change-Id: Id568642bd668f5d83f370d366992d93c14e09166