Merge "Fix controls management activities details" into rvc-dev am: 2688e2237b

Change-Id: I18bebfd5b775a9054c0b6d48fa50dfc29ad83b5d