am a0296d64: Merge "Fix orientation test and improve its instructions" into jb-mr1-dev

* commit 'a0296d64c0c18e1a892d0ef770830624a8af0411':
  Fix orientation test and improve its instructions