Merge changes I1d03564f,I883e4e6c
am: 5b21deb786

Change-Id: I0a92e6f94174c76731159957172a6596cb9147ce