Bug: 116364655 Test: robotests Change-Id: I313272737dc7c068c47abf8ea021de7d2bea0a25
Having consistent import order will reduce chance of merge conflict between internal and external master Test: rebuild Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Bug: 110376110 Test: Tested on device Change-Id: I2bbb8d01f675fc254e783b97b44d16f36846a416