Merge "Fix for HDRNet producing nondeterministic results." am: d6d227a99f am: 1b13c5e03d
am: ba41e2f49e

Change-Id: I9f4c024fa941e4d86157b6c0f56dc55407c0685a