[automerger skipped] Rename kernel config modules from current to Q. am: 18cb552a97
am: 89511ce61c -s ours
am skip reason: change_id I4f519d9c67a983df15423f556ecc68586c6a100b with SHA1 c0cbe539f3 is in history

Change-Id: I45a565b84fa8fcc2502aa33626f83d2c86eb22aa