22.2.0

All left over CM commits up to 04/08/2013

Change-Id: Iad51dd7fd8cbfd96cb46d262649b76f1a1b2c988