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

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

Change-Id: I3d092eedab90c893d27894ac500db0774fdef0ff