Merge "Squashed commit of the following:" into gingerbread