Merge changes I86bcfaaa,I24d7f5d0 am: f99711fe87
am: 157c2fa504

Change-Id: Ie9e05081da1ba2c67d80b197aaeaa0706cc7c64a