sync from 217d5f74 Test: build pass sunfish-userdebug Change-Id: Ic20667c65344e5f4157daa4b909c2db1361f35fd