Merge "Fix adb bugreport and add bugreport unit tests." am: cb47a08e14
am: ab59d1f81a

Change-Id: I21e480b5286c3b9ad7ac70305235e630437b318e