Merge "Add support for publicAlternatives"
am: edf3022c0a

Change-Id: Ic42aa377eb50bebbb17413cccbe7648c47076477