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

Change-Id: Ib4377aeec875fc57abce10c4515d36534b21e7ed