Merge "Add more information to removed controls" into rvc-dev am: f4674d00 am: 5a5ed004 am: 63e833ed Change-Id: I819d2c0f6cd587cb27759abb0338eaae7f28cd01