Add back missing codes which was probably removed by the previous revert
Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy