Merge "Merge changes from topic \'blockOnProcessingUnsolicited\' into nyc-dev am: ff0ff67ecc am: bb1b31a3aa" into nyc-mr1-dev-plus-aosp