Merge "Remove unnecessary --hide-package options"
am: d4c8842a8a

Change-Id: I174eaa7da0a782f1c3940e81b09d9238159ac496