Merge \\"Fix NPE when trying to clear MWI for invalid subId\\" into nyc-mr1-dev am: 751e59d935
am: d481e01f20

Change-Id: I14d6b62533da99fbcab740337e5fa5df959d1109