Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp()...
Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef145 am: e498bbb3
Change-Id: I1e41523c6adda4af30c33d57c679b48e5ec913c1