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

Change-Id: I09eead06a47aa5f97ba5dfc0a8fd4e68655aa75e