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

Change-Id: Id409783b9fb71a71c982d5d7fe6c21bd20f5d84a