Merge "Fix darwin build break." am: 1a73e9b7e2 am: 8fc46f7c6c am: 50ccd9a7aa
am: 4f54f18249

Change-Id: Ib75ae41b71307f82cc787a8c0835c89c6b1a2841