am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
  fix issuse 65774