Merge "Update MetadataController" into pi-car-dev
am: 2101be6235

Change-Id: I550c679aa8896cc1996ba1651e7c093b0e3ab3fc