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