Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544 am: 4fbf46cdc5
am: 4e8eeb93c9

Change-Id: I07226cd02d3c5557ee05954efdaccfb70c7431f5