Merge "Increase threshold for host theme tests." into oc-dev am: c76e609fd1 am: 9318ab541d
am: 7fe6c4cd87

Change-Id: I096e4d959b9691f83d3de2912979d466a1191360