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

Change-Id: I7dee3ab3941ba756779b9d28c51b8986690f4a4e