Merge "Merge "Only update overlays for target" into qt-dev am: ed4820f0d0 am: 8052a9b958" into qt-r1-dev-plus-aosp
am: bce6fd9156

Change-Id: Ica5dd5518a5e674118232cabdc8405caa169569b