Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev
am: 7f352dbeaf

Change-Id: I8c54851ba1118185d0a775603a0122749e3fec79