Merge changes from topic 'aia_settings_overlay' into oc-dev
am: bd20a7b263

Change-Id: I6018aca9d49de7cc485ddceb15263a5d9db87d07