Merge changes I8e44ba77,Ib8b933fe
am: 8e41582c8d

Change-Id: I1a122365e2d007689dd70fbd021acac66e171ff7