Merge "Add more information to removed controls" into rvc-dev am: f4674d00 am: b60c7f0c am: d9c1e54f Change-Id: I3f692b566b5afbc5a7c04cbc3752447c1e55a159