Merge "Add more information to removed controls" into rvc-dev am: f4674d00 am: 5a5ed004 am: cc0ae3aa Change-Id: Ic67c13290043e4a8c1c09158ea8d28a5a28f2e9e