Merge "Merge "Only update overlays for target" into qt-dev am: ed4820f0 am: 8052a9b9" into qt-r1-dev-plus-aosp