DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 65205aefc1

Change-Id: I0df5795ffa7a4278f3ac7af83eeb17d968b2062e