Merge "[automerger skipped] Merge "Added Changes relates to AntennaPosition" into udc-dev am: 262091dce4 am: b9e7f3288a -s ours"