Fix misc AOSD changes
Change-Id: I29dbb32e7d626c993b97bcaa5ea4343262980337
Signed-off-by: CNBLACK <didwjdgns21@gmail.com>