Merge "Avoid returning decrypted data over binder" into nyc-mr1-dev