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

Change-Id: I5a99a516af64aec093749f11cf6d1586431eeed3