Merge "Add support for publicAlternatives" am: edf3022c0a am: 7764ff39b9
am: 8cac33b185

Change-Id: Ib2af39c4e2a4b8074bba738df6d9baa1b282a970