Merge "Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6ac8410fd3" into rvc-d1-dev-plus-aosp am: 455f59ed4b
Change-Id: I15e82f7c70c25105709a99b6081663d3fd4628b8
This commit is contained in: