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