Merge "Fix broken tests. am: 3983fd88c3 am: 9cbb72e323 am: a02ce97591" into qt-qpr1-dev-plus-aosp
am: 755e159b1c

Change-Id: I5e0e2caa51ba0c208e85351f06ac40103fa38033