[automerger skipped] Merge "Clean up code of starting bug report" into rvc-dev...

[automerger skipped] Merge "Clean up code of starting bug report" into rvc-dev am: 4328b613 am: 8ec0010b -s ours am: 7c75df16 -s ours am: 9c904842 -s ours
am skip reason: Change-Id I50908af63d74ed66156354ec0b5a237f7131061a with SHA-1 46ab985f is in history

Change-Id: I8df46b5624070c4f9709d667f07dc5c073998fb9