Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a am: bf4a67ec0f am: 28688c3ba3
am: 802b2f8561

Change-Id: I3bab1fcdd3ce7de7cbc6015011ec12a86ab76dca