Merge "Check for sub count > 1 to check for multiple active subs (not > 0)."...
Merge "Check for sub count > 1 to check for multiple active subs (not > 0)." into qt-qpr1-dev am: 77f615f2
am: 72bafc5d
Change-Id: I8d6ff6d7304994d884d26e960ad5360b9a3f89f9