Merge changes I87f2999f,I8af0e845 am: b07dcdba37 am: ac42ccb056
am: 7ae1c26e21

Change-Id: If92fedc399dfe1efeca332b7cb89188ba48b44b2