Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b1324 am: 2049c6b5 am: 25cc14ea am: 6348c524 Change-Id: I225a5ff05808c148c473091695470b68ea44cb56