Merge "Remove clearDefaultsForInactiveSubIds." am: 1e263e7bc0
am: 4e32ac7754

Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da