Merge "Add public API" am: e1e039606f
am: 7925837b5a

Change-Id: I39decc0e8108d9fe4d0ea9f362e1e0697c9a0b91