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

Change-Id: I45b714d61aea76ce03a28221a60828ee0cd78ed7