Merge "Fix mock of setApplicationRestrictions()" into oc-dev
am: c9a6e75682

Change-Id: I6abbe1bf0073e236f1379a2dca208f5d3eab5e7f