Bug: N/A Test: N/A Change-Id: I17345cb72a5ffc3af1688cf5874589cfb1e1fea0
Ported code keeps needing these one by one, so let's just add the whole set... Change-Id: I9662b256aeaa1b0ffb22354130e503f0c4aa472b