Merge changes I799508fa,I4951cca2 am: e5ef1beb2b am: a46ba8ce7a

Change-Id: Ifb430a2e7093c3b30daee47a26b2f1c31ab4e6b4