Merge branch 'release_candidate'

Change-Id: Ide2d0b282a2c10a080c2f4a09c758059e5e4ed39