Merge a775965b from gingerbread

Change-Id: I8c08cca033ef3efe6badd2a7ba4674dfb02d6b60