Merge "Fix build break on Mac." am: a254efc1e2 am: 16c7928a6c
am: 009d5d267c

Change-Id: Ibdf51941b576300b04d4553723d12c20b2d0ff0d