Merge changes I1893a45e,I29bf9acf
am: ca5868f882

Change-Id: I47045e5b3e411240a12fd869ddc871d4827862e7