Merge changes from topic "kernel419" am: 891b3600cb am: abd8783339
am: 907d28bfd4

Change-Id: I6c435601a0ae7fbe57685f2826eb31ff71a694ff