Merge "Don't install package if it's required to be known" into oc-mr1-dev
am: 57d42ed0f9

Change-Id: I51cd490d1d2df6ededf26e3f980ad1c21e4b46a0