Merge "Revert "Call noteOperation() in ShellDelegate so that noteOp() really...
Merge "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes."" into rvc-dev am: 28354e54 am: 323816fc
Change-Id: Ic2df433be674961683ecace1367ea86b4e5a9079