Merge "Do not allow to disable package "android"" into nyc-mr1-dev