Add validation for publicAlternatives
am: 1cfbd2946c

Change-Id: I3da61445e7bfa4185c7f7120e84e0d08e44b8576