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

Change-Id: Idf0af2491d8a90c052e5dddbfba5da7c9059b544