Merge "Fix build breakage on non-linux"
am: 348878391a

Change-Id: I2de8147849bb26aba91976046affd53201dc8f1f