Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
am: dd7efc3287

Change-Id: I5300155237985128a9a4447d2e95aec60def6891