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

* commit '4434dae41254ffd5aaac0afd63be0f32d198efbf':
  Squashed commit of the following: