Adding new library and entity class for the new API am: b73a5e5d59
am: 676707a6b7

Change-Id: Ic466daafbcb72024664cdf821c8df1914ec71eea