Update to the latest dic (merged from master).  Catching up with https://android-git.corp.google.com/g/#change,48759 and https://android-git.corp.google.com/g/#change,48699

Change-Id: If43ddc27a8f5578ba190bca10f690513af451bcc