Merge changes I11abcf8b,Ia638bb4f
am: 6e988fdc1a

Change-Id: Iae728851ec301489eebf00a14e2c76fe2cb08817