Merge "Fix java doc for eraseSubscriptionsWithOptions" am: 8db38c9ef6 am: aeeff0287c
am: 20c9b8e520

Change-Id: I2fac1ba6f9740c28b11c352c4b06c4b91ba303b1