Merge changes I0b36da44,I459b4cbd,I7c05f8f2
am: b15412401a

Change-Id: I770ae6586b7fc761d92ef2c7a6d45a27bfd50295