Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 am: 4d409ca18e am: c90c9307ea
am: 5ef197eb7c

* commit '5ef197eb7c9099cfd31d089f67cd7cc9c17be942':
  Squashed commit of the following: