Merge tag 'android-4.4.2_r2' into HEAD

Android 4.4.2 Release 2

* tag 'android-4.4.2_r2':
  Reduce logging of flattened Preferences

Change-Id: I7f90dfa99498a81a080736da08a0cada932334a5