Merge "Parity between sdk/ndk/internal for QP manipulation constants" into sc-dev