am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev am: b5a1be98de

Original change: undetermined

Change-Id: Iadf050c5fd9eaf84f70d3b3e4a41dba7247aeec1