Merge branch 'rc14' into merge.rc24

Change-Id: I900e1b97988c4b6bdb6b0b6d49089e7cb0c2d657