Revert "Merge cherrypicks of [11219356] into qt-d4-release"

This reverts commit f96b3c9b7e4c69c1fddbc5c9ccb1b649a8e3a1dd.

Reason for revert: <INSERT REASONING HERE>
The change is for June Security patch but S5 has already lockdown May Security patch for launch. 
S5 will have arranged July SMR after launch.

Change-Id: I1f1cab5890b75012dba119717baaf5cca6c87e9c
(cherry picked from commit 75fc007d66c23415bedc8e2e54db851dfbd3a215)
3 files changed