Merge changes from topic "kernel_config_arch" am: 4b7cbf8395 am: fd8eded8f9
am: d29bf905af  -s ours

Change-Id: I3a1dd1dee07c399e2d66b3707b24788fd9723b9f