am f2c509a8: am 310da35c: Merge "Follow up API signature change" into lmp-dev

* commit 'f2c509a81ef107e6c71dc6804417469d12c94fca':