Fix PopupMenuTest am: 94940fe6cf
am: b52b00a0d7

* commit 'b52b00a0d7cc096d62fafc7283717007eae31718':
  Fix PopupMenuTest