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

Change-Id: I92e97381ea7969365e8a72c1395446aa384f3c83