Merge changes from topic "kernel_config_arch" am: 4b7cbf8395
am: fd8eded8f9

Change-Id: Ib7bd5873440bb5a3d3cb8f48fb176a2b665fe22f