Merge changes I002c99ac,I393ecdee,I22f40325
am: 8db788b348

Change-Id: I26ec3fa12943e1d27e796a8f5474b0bc52b998b5