Merge branch 'release_candidate'

Change-Id: I9c9ab6e5211f0154eac3685d3b037ef912cdfc26