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

* commit '7f14a76e9c74d69d25a66d8bd4656a1243c6feb4':
  Squashed commit of the following: