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

Change-Id: Icc263b71fda34e97097d151f37c15be7b031c79a