Merge "Use Base64 from android.util in LocalTransport" am: 8b9f98536e
am: ec99ee195c

Change-Id: I9b6c5dfda1a35df8e55c6ae3943fd763456b6d22