Merge changes I46e819a0,I4ee4ff98,Ifae9c912,Idc58efce,I60b0122f
am: 05b5e8912f

Change-Id: I61f294bb7626b95e14dab0ed05f1e77de595e6b9