[automerger skipped] Merge "Early wake-up for transitions (1/2)" into pi-dev am: 9d8d52b6f1
am: d93c8ee42c  -s ours

Change-Id: Ief8e4032ff3d8ce47b09353572299bb7e6f99a1e