Merge "Update 4.14 to 5301403"
am: ff2fe991d8

Change-Id: Iac0a810f11c111ed4894e1d79d37d32a32bb64d1