Merge changes I8e51415a,I79a255c1
am: 668ba83a0a

Change-Id: Ibebfdde3f142515400a75a53f8d40ef99f64f50a