Fixed AOSP remote

Change-Id: I684d6072a400b4f81cac0fb6423c30cb3c75294b