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

Change-Id: I89decf1cc952694f82a48d9d8623e267835f15bc