Merge "Bugreport includes /metadata/ota" am: 1ae83b4e2b am: 3c2346bba2
am: 8c6e75eac3

Change-Id: Icd76193d0bdddaa4c90b6981d9d2e1520506ff64