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

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