Merge "Linux compilation fix"
am: b82c85d0b1

Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782