Merge "Make isUsableSubIdValue public" am: 37064062bb am: 481f02cc65
am: eafd95f787

Change-Id: I63e9e0cf7e08faad38c81b13a19201d5283f284d