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

Change-Id: Ic1986a1399a61b9ba3455d7ff4d2365cded86194