Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a

Change-Id: I67eddfc3c077c94d0a61276d8b89dda0148c3012