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

Change-Id: If24242de654eb2c195fec177266eab71bfa63f8e