Merge changes I8e432950,Id325b8cf
am: 919ff2268b

Change-Id: I0912e9a426a5cc72e67b3ec55e2bbe195079eaf6