Merge "Explicitly depend on privapp config" into qt-dev am: 9b5a58c20c
am: be58489723

Change-Id: I15db0311b5ff028b36d3fa6ca51c184d3554d3d5