Merge "Refactoring of AppOps pullers." into rvc-dev am: 8907d917dc am: 97ba83880d

Change-Id: I09fa8be5c9b77aa53f84eacc1009b901dd2f9717