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

Change-Id: I097e68733d10d701ff15af7e342e7458aae5d1ad