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

Change-Id: Iaf48468a61a32f8cbfa92280401d4314496ad434