Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev am: 625280b87c am: 6ab8eadfbe

Change-Id: If934b8b3d09c3d100d48f921727bb1101bd88608