Merge "Apilint updates" into qt-dev
am: dec99848ba

Change-Id: I8f2ceac86547be19775d2462fec38a8aca17330b