Merge changes I799508fa,I4951cca2 am: e5ef1beb2b am: a46ba8ce7a am: 9354509616

Change-Id: Ie63ed58f9e6e1efe8bc036cc665d5fb6f8ec4974