Merge "Update a few interfaces." am: 2785915f7c
am: 9232b53860

Change-Id: I5e20deeefec7c45a4c5da867d22e415b1759c38e