Merge "Split package and permission lock."