Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
am: 8b85444802

Change-Id: I44ba889725acdb43e7eea890cc0bfa9fe3c2b5a6