Move to libbase properties am: 012aa5bc82 am: 6a253467f3
am: 92aa77e1ad

Change-Id: I1a4643e08060ba39de1bab9fbedbbde599f33383