am f4aee7bd: Merge "back port upstream patch"

* commit 'f4aee7bd601621d648044a0f918247fd81b6190a':
  back port upstream patch