Synced repos to: 187640

Change-Id: I707d764fa67758c45996f3e81f9081d82b9b111e
Reviewed-on: https://gerrit.chromium.org/gerrit/22963
Reviewed-by: Han Shen <[email protected]>
Tested-by: Han Shen <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
Commit-Ready: Han Shen <[email protected]>
2 files changed