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

Change-Id: Ia60ebd57eeaf79601f4e876d6d03a503a2bbf1b9