Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6ac8410fd3 am: 3dccc387fc am: 081d28e13d am: db73289ad4
Change-Id: Iec1a625daa5e086756bda64c4d5f0dac7a7515b0
This commit is contained in: