Fix duplicate OAM locid
Merge branch 'master' into banguero/appbar-menu-showhideapis