Merge changes I592d3538,I791fd630
am: 42914720d8

Change-Id: Iae4c04c2f86d73c711d0ceab710ef1464c149370