Android S Beta 1
Merge "Fix the HAL uninitialized error message for setLocalPrefixes"