Merge "Removing possible user defined strings from bugreport view-dump" into rvc-dev am: 31c94a2f am: 4f307ab1 Change-Id: Ib404ec78bb2453ff12b10b30ab9b7ce197072739