Merge "Fixed 13 blockers in Subscription.java"