Add validation for publicAlternatives am: 1cfbd2946c
am: 4486b76768

Change-Id: Iac94e4816df88f7ff8ef83d3f3c3dbccf20dd875