Changes for 3rd party apps

Change-Id: I55fa03e46dda28d31ca2bf29a9bfa8ad9cebbfac