Merge changes from topic "hidl-updater-system" am: 5a490d4bb7
am: cfea213006

Change-Id: Ida737ee8bdadbacc656e9f6b96f29d793089e695