[automerger skipped] Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev am: 7f352dbeaf
am: f17d6e3010  -s ours

Change-Id: I16f1ac17063fefe9d25d0442704880e2090a9aa5