[automerger skipped] Merge changes from topic "kernel_v503_2" am: 06c65b864b am: 94c0cd9393
am: 4f5e4b4983 -s ours
am skip reason: change_id I3719b1ca48515170eca5834b1a29f15086441b50 with SHA1 f5c0e909b1 is in history

Change-Id: I925121ebd31042a7d2e578fb78363f4b3ea899c2