Merge changes I5e684409,I4fa35540,I24015ef0 am: 93de77745c
am: d1378dec05

Change-Id: Ib7984c3abaed6c2ad5e63beee45bc263d076750c