Merge branch 'v4.4/topic/OPPv2' into linux-linaro-lsk-v4.4