am af016cf1: Merge "Fix for menu XML ending with a sub menu" into lmp-mr1-ub-dev

* commit 'af016cf1032692621ecc05db68b75fc5c33ab659':
  Fix for menu XML ending with a sub menu