am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another...
am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev
* commit 'fad41c8f':
Fix Java API error where requesting another style for a provided family fails