Merge "Squashed commit of the following:" into kitkat-cts-dev