Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a am: 26551165d3

Change-Id: I2876023ccb543cc79b360d2ac312466abd4deb95