Merge "Cherry-pick fix for 1.2.11 deterministic output regression" am: 1be35eaf4d
am: 5613fd2c5f

Change-Id: I0a6657f237f3eb97a8c7a8e5915a0610295c05a7