Merge remote-tracking branch 'm/master' into futility

BUG=none
BRANCH=none
TEST=none

Change-Id: I0b6af03e0037956fbafa84841d40a7945566f979