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