am b0c76f62: am fb58f56d: am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev

* commit 'b0c76f62e70440591d611eb3c422e0afa7a737fa':
  Removing the screenOrientation attribute from the wearable manifest