Merge changes I4d6da40d,I91c7ced5,I7b9f6d18 am: 2fa9770c3a
am: 2571b1f0a7

Change-Id: If8e98b0f9aca81245ecb15a1e1e65dcbd1f3b87d