Merge changes I8186718c,I8d6f33e9,I56fe5e11,Ie4004c98,I531d3d60, ...
am: b26696e2dd

Change-Id: I0831809e6b0ece5d3e20c660f3331e6dc5466f79