Merge changes from topic "kernel_v503_2"
am: 06c65b864b

Change-Id: I920dbe69867a81fe8a41aaeb2fe450892abd74ee