Merge "sepolicy : Initial changes for apq8084"