This change should be done for easier integration of ma8 port.
Change-Id: I732ebd3446858b497105cf03fc81e934a749a57b
Change-Id: I79aadc958fd5222f26f91ed127f8c6fb2c465dc2