Merge "Fix issue #27252896: Security Vulnerability -- weak binder" into nyc-dev
am: b49576d

* commit 'b49576d5241859a3cf03c9f34b8030ad25d3806b':
  Fix issue #27252896: Security Vulnerability -- weak binder