am 6da2afa9: am 31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in...
am 6da2afa9: am 31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
* commit '6da2afa9':
Fix SHUTDOWN after SETUP and before PLAY in wifi display.