This change works around a compiler bug with the GCC 4.6 toolchain. Bug: 6292211 Change-Id: I004c4750d92a29f193a37d8e605a28fdc3b7f076