Merge remote-tracking branch 'goog/master-arc-dev'

Change-Id: I8a1c43f825b3d916689c428d15f0c247039decfa