Merge "Fix non-Baker build."
am: 0a6fee861d

Change-Id: I17940a20e7920958abe77947d06556d502801375