Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Work on issue #25467052: System lagged out

Change-Id: Ib124a6cd741e7f101f371c07b3002b1e1262ba56