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

Change-Id: Ic33576c705505196c80c648b6616769b9af427ce