Merge changes I04517ee2,I476792ca
am: 53e6c51bf1

Change-Id: I84f670cea3f770d0b5d74c9478c6d43aaa71454b