Merge changes I1c5b075b,I4bf5b314 am: 99e17ff8cb am: 78bd7eb032 am: 0fb5f0317d
am: 1ecc4c9e73

Change-Id: I975c9fcf5508ec0e0aca1dadeb37862ae31506c9