New push after GSN works fine with Android App

Change-Id: I030eaa581da06ecb394c8165e5c3a03fbbf8cb22