Mass merge from gingerbread - do not merge

Change-Id: I1fadb096a42c4905d243428a91025ecb759443cc