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

Change-Id: Ie86bc94d8e371e824e8584718a8ac9aefae6982f