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

Change-Id: I87a939b11398381ed4477d93a0099ac8f4ca4328