Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
am: 53414a98c2

Change-Id: Ifc2540c0d8d4e1fdebdfe5127d36f45b68795ef3