Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ff am: 538bc0fe am: 5d2bb5b5 am: 4fbf46cd Change-Id: If75db66e9e24d802b01267d1e7686d7261138be6