Merge changes I29c45a8b,I807439d8
am: 892b158af8

Change-Id: I5a42470134b1f7d3bb029e16d15346fc95a97fed