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

Change-Id: Ie00c1ae1f8431659606adaaf78deffc25fb85118