Update to 3b470f56b479f618b7e90577f9857b4e25b38c1a

We need to update to trunk since that the branch on which development
started after analytics' request to target 0.8 which has not yet been
released

Change-Id: I1929f3eca9cbc5b318222270e18229d0ebb88497