Ported code keeps needing these one by one, so let's just add the whole set... Change-Id: I9662b256aeaa1b0ffb22354130e503f0c4aa472b