Merge branch 'release_candidate'

Change-Id: Iee99a63e430f286c68dc0bf8490882351a8725ee