Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206
am: 91f736fe1a

Change-Id: I43824dc487e506423d3b54638665bd51edf870ed