Merge "Fix darwin build" am: 8c0c1ba989 am: e68fa81351
am: 192cd6ec1b

Change-Id: Idcbc90b288e05f0f1ee06653174f2885baf18009