Merge "AOD: Fix AOD background bug" into oc-dev
am: b8b748b7e6

Change-Id: I3026455c7460c24433d905fce63a4018a0c14271