using older physical android device.

I am working on getting a new one, but at this time, I just have an
older device.
Merge branch 'older_android_device' into develop