Merge "Convert disting of api txt from mk to bp" am: 019256c4a6

Change-Id: I54924389c86b90ebaa2c072a5b4b14ca869a774b