Merge "Make isUsableSubIdValue public"
am: 37064062bb

Change-Id: I5b5bdd8ab047edfa82e0c04e48fc3ec16e3317b0