[automerger skipped] Merge "Add public API" am: e1e039606f am: 7925837b5a
am: a8021a39f3 -s ours
am skip reason: change_id I80e772354c8cabf30ef513701cb7850590926dca with SHA1 78db121770 is in history

Change-Id: Ic8a64985d91085527e3507a9f04d7ba8aa501b14