Merge commit 'android-4.4.2_r1' into merge_branch

* commit 'android-4.4.2_r1':
  Reduce logging of flattened Preferences