Merge changes I25e81a77,I95b8c142 am: 658f09ab75
am: 5eb4d27f9f

Change-Id: Idcd7b606042b4982c35397703fd4b7d92b4e0167