Android O MR1 IOT Release 1.0.5 (5014699)
Merge "Fix for HDRNet producing nondeterministic results."
am: d6d227a99f

Change-Id: Icff55766867b5652aedd13820c6848107f90fd33