Merge changes I6672c5b0,Ie053a5d8
am: da26bc7cff

Change-Id: I6f0202f8bfe7cc6a56f02069e3dedfdacfeab6f7