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

BUG=none
BRANCH=none
TEST=none

Change-Id: I817f78c5844a3e8e3ef7fdca339b716b09b2e3d2
Signed-off-by: Bill Richardson <wfrichar@chromium.org>