Merge changes I0e5f6d04,Ib7ce6740
am: c5a3a68ff1

Change-Id: I31ee2dd7827b60aa32aba37fdcb9746a77bf0aea