Merge "Add privapp config for cluster." into qt-dev am: 826c01e8e6 am: 600d39646a
am: d64a36175c

Change-Id: Iebeecabd83127b2ff83557cfc5de6ad1cf06a6ec