Merge "Fix missing overlay values" into qt-dev
am: a2046c0576

Change-Id: I2b7cb6b8bf2e35f597cf2f06c2f324d5a2dbc414