Merge "Don't reject notifications and wait until new addressed player is ready...
Merge "Don't reject notifications and wait until new addressed player is ready (1/2)" into oc-dr1-dev am: a8c7ddb9
am: c9bd8435 -s ours
Change-Id: I38e796975938fe88c57a80a411e9e7e36886cb7f