Merge "Fix issue #28051399: API demos crashing on Remote service binding options" into nyc-dev am: 14e56c1aa6
am: bad61ac301

* commit 'bad61ac3011e2c9d9d81b514eb3bb99c81031f73':
  Fix issue #28051399: API demos crashing on Remote service binding options

Change-Id: I368f1b822902d27fd0304bb5e633e36137e8404f