Merge "Fix build breakage."
am: 29a7fd300a

Change-Id: Ib410f96a0b73d5fcdfda1002d7f7c1563b6eb634