Merge changes I99ca081f,Ic252ee0b
am: 6dc8615886

Change-Id: I04846f140c9d161419f5dc321a9c49f528b58000
tree: a770acf21f20fed9a33fdd1d12446c9b2e261f3a
  1. android/