Merge changes I1c5b075b,I4bf5b314 am: 99e17ff8cb
am: 78bd7eb032

Change-Id: Idcbd05cf2ea58bb85d3b4f85dafbc809cc53a16c