Merge changes from topic "kernel_config_arch" into oc-mr1-dev
am: 8fa591d7e5

Change-Id: I51c0e6455748197268c588a9b9919f74dc6b70b9