Merge changes I0b36da44,I459b4cbd,I7c05f8f2 am: b15412401a am: bf5ddfbafb
am: 7b77865cb2

Change-Id: Id3986039ef0930d9388de0cb1fb04cb78ebd5c72