Merge "Enhance adding subscription logs" into pi-dev
am: e62c41ef3e

Change-Id: I041315a7371c79924443dcb07842444f26446a75