Merge "Fix darwin build break." am: ca5560cb7f am: 6d108dd5f9
am: 6d972d0f94

Change-Id: I6cf09f9155860cfd8f7baa518f5e2f99e3d702a6