Merge "Don't allow upstream if entitlement don't know any downstream"
am: 161814ffb1

Change-Id: Ibac99a20b470b48597859fe737732f3c6f491805