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

Change-Id: If330e288df1a005863dda4fd3980a78c5326c449