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

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