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

Change-Id: Ia1f79cd610ea31616d426f549a30bdcbc73010c1