Merge changes I15f6f5ec,I1be1d442
am: d3a912fe60

Change-Id: I8f6e7a78a00c9a77179be40053907a553509e4c7