Merge "Move to some properties users to libbase properties"
am: 2b20612e77

Change-Id: I376b9179ed242810c529d289558a44b422c1e8f5