Merge "Add public API"
am: e1e039606f

Change-Id: I7a0ebbe1d5b93d691385d17c493911b41121aee2