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

Change-Id: Ibfa3dfd6a187f6926831910cbef920cf122721a1