Merge "Merge "Fixes breaking test" into qt-r1-dev am: 4c1435a8eb am: bac83940c1" into qt-qpr1-dev-plus-aosp
am: 8cfbf722d1

Change-Id: I404bdd0eb8fd4c3a77c45788844f4f5c98814e21