...from 43debfae83 "General cleanup of OfficeBeans," as this is a stable interface that should not be broken airily. Change-Id: I931a611341a1b29346d134c11ecf886fe7767836
43debfae83