Merge "Enhance adding subscription logs"
am: 263913016f

Change-Id: Ie8b1cf1c4e50ea1b7e9eafb59259848428484a3e