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

Change-Id: I0396ee93c86fee2b2bf16988c305a9d9cc8ed9e4