Merge "Added edi collector for app standby feature" into pi-dev am: a3e75de8cb
am: a6fbaa423d

Change-Id: If28146366006c93b6758aa5fafea374405ca6d65