Merge "Make the library usable as a library." am: ca94f65ea0
am: b38e142021

Change-Id: Iade7d011b49e4fb2c323ef17b8c9e89525befa22