Speed things up 

ref: https://github.com/ValidusAOSP/frameworks_base/commit/0c1f0da5511e148e092ae6ea53453193404d5bed