Merge "Address missed amend"
am: f3c3595435

* commit 'f3c35954350ab3386cff538a123bc1b8e78e89f0':
  Address missed amend