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

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