Merge "Fix darwin build break." am: 3ea374f54c
am: dc51803f87

Change-Id: Ic106b0469ff98b83bec99504ca2b2b8a6f0249c9