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

Change-Id: If75db66e9e24d802b01267d1e7686d7261138be6