Merge "P requires 4.14.42" into pi-dev
am: 6e839e80bb

Change-Id: I7d741a1faf84be0dbf452faba71e635ef0db3fbb