Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev Bug: 135069613 Test: just merge the branch, nothing works yet Change-Id: Ifd33b9cbb3a2c77e9dd855d628798cb71a0393bc