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

Change-Id: Ib66f2aa4662e0c576e2c71aa9d80abf35b800789