tree 193f117c6d73cb387856f147d2a1f27f2cd54810
parent ef1af2773e238de982d98490d8542668f6499ac5
parent 1c3db7d742309c0178068abbb65e2298f715ebdf
author Amin Hassani <ahassani@chromium.org> 1547235053 -0800
committer Amin Hassani <ahassani@chromium.org> 1547235182 -0800

update_engine: Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Do another merge to get a few important very recent CLs.

BUG=chromium:916593
TEST=unittests

Change-Id: Iee29b797270d8733838e755f9da0acaa405fd770