Android CTS 6.0 Release 23 (4337277)
Merge "Suppress clang -Wc++11-narrowing warnings."