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

Change-Id: I569fe97528b71dde2a981e563622be7e49929bc5