Merge "Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946d1 am: 2caf7fa79d" into rvc-d1-dev-plus-aosp am: 5d4d3e152d am: 0d5a5efa01

Change-Id: I3ba89474eff5a3ef77f737051847e7ea75ee0eeb