Merge changes I9da57d50,I8779be58
am: c299eb2e6a

Change-Id: Id3c585f45aef5aacd4c5499b125480a36fe7920f