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

Change-Id: I14523331ce2f85cff8714887271f38ff25250260