Merge changes from topic "kernel_v503_2" am: 06c65b864b
am: 94c0cd9393

Change-Id: Id0baff6b8cc227c6573e965471d47c70cb2a02f2