am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev

* commit 'b28b83cc4c7b7dce85b0f51f7d4f3b1122db729d':