Merge platform/diskk_updater into platform2

BUG=chromium:387976
TEST=None

Change-Id: Icf159ee05c8089cb18d1b215991fda0ef3476ece