Merge changes I38c76bb2,I81a55e92 am: 3aaca7dd60
am: 803e6a71f8

Change-Id: I8ae9c2bd6d061d86013c5279bdeabb789d7335a0