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

Change-Id: I85a49b272ac86312dfb284e29d49aafa4f3b3c02