Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:...