Merge "Merge "Check bit-depth before creating converters" into tm-dev am: f9591d6ba0 am: fe5ba7a9f1" into tm-d1-dev-plus-aosp