am ccb4908d: am 81f8cd92: am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

* commit 'ccb4908db44871994084ce8375a7243431b665ac':
  Build fix after changing IWindowSession.