Merge "Fix APC documentation" into qt-dev
am: 30e37c12e6

Change-Id: I2124309f7aaf2d96c0fa1d850087a98d8a6308a4