Merge changes I7410915a,Iede082f5 am: 25ed6783a1 am: a94ac660dd am: abdcc0cf45

Change-Id: I50062bf040b1e848c060703f655f5ad06925dd4c