Merge "Merge "Fix missing overlay values" into qt-dev am: a2046c0576 am: d0f8cfca88" into qt-r1-dev-plus-aosp
am: cee644500d

Change-Id: I602a9df4514b9b117e81fe4bfdfe2f557891b28b