am bf7116a9: am 049e663c: am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev

* commit 'bf7116a9ddeff368b6a33fabfaa82ce974d5ee0d':
  Fix a bug in action menu measurement