Merge "A few more interface updates."
am: 962e3e23d0

Change-Id: I1a333b98199343ca8ab51bb7bad0921679729388