More 14.0 -> 14.1 changes

Change-Id: I38a2589e5743aac0d8b13799b3d79cb2dab8e5d6
6 files changed