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

Change-Id: I0a7dc4da3afe2b1ba3d6b3124e8345cf7fe196aa