Merge branch 'bq27000-2.6.34' into om-gta02-2.6.34