Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev