Merge remote-tracking branch 'goog/master' into 'goog/mnc-dr-dev'

Change-Id: Iddc76f624b3655a84643749f430362fd6d5bce6f