Merge "Move blacklisted methods back to greylist" into qt-dev am: 71a267b66f am: ffeda699d5
am: d6d2f8f482

Change-Id: I4a20576ad47aaa89523c22563dcbe1c85e2048d1