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

Change-Id: Iaa67d88d07e5ac76d39a8f1675c6c2477b870044