Merge "Partial cherry-pick changes on permission model change. am: b8e4193e57 am: 3c17d8a871" into nyc-mr2-dev-plus-aosp
am: ef5dd65446

Change-Id: Ia303bbf624576ebe6aba282003c27d09069cb264