simple_remote: changes from blue 3.4

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Id13304a8f0cace18536e9ce0a7ab9cf167295089