Merge "Linux compilation fix" am: b82c85d0b1
am: 7c8dd3bb93

Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e