Merge "Upgrade to 8.3.1"
am: 918190a647

Change-Id: I5204b09db151175722a22739fa596c3cf15a3f70