am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev

* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
  Fixed NPE in EnterTransitionCoordinator