Merge "Fix permission javadoc about whitelisting." into qt-dev am: 4918e711d3
am: e524e8e22d

Change-Id: I03c0f69b509bb7f1a8f17e8c2d18f2c3bbb9325e