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

* commit '4d409ca18eedc4fdbed48afdc9ec38b9bbbaed9b':
  Squashed commit of the following: