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

Original change: undetermined

Change-Id: I67096d24869472f03d1461db0e43d9c6d9a6cd2c