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

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

Change-Id: I7f7dea00b52ddfc7b8fd9860d75713b7910ccbfa