[automerger skipped] Merge "Fix issue of empty active subscription info...
[automerger skipped] Merge "Fix issue of empty active subscription info reported" am: 90e7dbee am: 2d7dd66b
am: c171a44f -s ours
am skip reason: change_id I0bf61ca011eb9bc4e094219068d7f5d97c701a6f with SHA1 8fb675d0 is in history
Change-Id: I73f69c4ed5b6ae718f321caf6765c5cff11cf7ef