Merge "Fix coverage build."
am: e0a367384d

Change-Id: I638e8be1e8f028475446fa4716cf575e70b91294