Merge changes I7f697d1d,I60f47a48 am: 6c10141800 am: 7f4fc5e385
am: 066d04e759

Change-Id: Ic044b494ad9e082bf5000f081e3dca5b52be66f6