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

Change-Id: I4998785bf5d83d26466007b0ded7b0a6523ab33f