am 2996adb7: (-s ours) am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)

* commit '2996adb765fe34cf12744019d60b3db86fb31295':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)