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

Change-Id: Id1e7bdcd14dad61463cbca98e37972ad74df8aa8