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

Change-Id: I1fe4f587bb5f7452752ea3c7fc23635fb4a8aee2