Merge "Clarifying broadcast vs. predicted orbits" into oc-dev
am: ad217fe92e

Change-Id: Iabcb31595f2248af8f2facf8f5d170c16fe2319f