Merge changes from topic "kernel419"
am: 891b3600cb

Change-Id: Ibcd9308406947a7b0d2409875d7be3cb86fb6316