Merge "Enable auth on AOD2" into qt-r1-dev
am: 65eaa0df65

Change-Id: I0c3d2b2a792fb752caa76f8aaec79e5a51529664