Merge "Fix ShortcutService handling of locale change during device setup." am: 74204892 am: 5a34193a am: e367f398 Change-Id: I5573733392e04c8f0bee1f170b6b8b760e088235