am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev

* commit 'c0e7e74c9cb418f24d67c192543681d652c16cfc':
  Rename intent extra following API review