Merge "Remove unnecessary --hide-package options" am: d4c8842a8a am: 93802493c0
am: 0b5310c3bb

Change-Id: Ia51467e934e22b4c92bc23117fffc124a5efd2bb