DO NOT MERGE Fix AppOpsServiceTest am: c03b32c406 am: 47cc84875c

Change-Id: Iccb7dc7d5857c2fbd03372cc0f97cfd429ece85f