Merge "Merge "Fix missing overlay values" into qt-dev am: a2046c0576 am: 87752e9988" into qt-r1-dev-plus-aosp
am: e5992ac33a

Change-Id: Idbb5cc96f7030925c0a5c0e7415ef20a30965be0