Merge "Avoid returning decrypted data over binder" into nyc-mr1-dev am: 2f63815ca2 am: c219140a91
am: 33a6a37b92

Change-Id: If1fab0f8abedeb7880b289f3fe344343c17f3b85