Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad
am: bfeea01aa2

* commit 'bfeea01aa2882faa7f5662e8fc0c1299b7fc518a':
  Squashed commit of the following: