Merge changes I0f351991,Iec79211e
am: 5815a5006e

Change-Id: I3eab81097008d5a549e1b20f47ee5298d6b85691