Merge "Update WM Ext aar to include java functional APIs" into tm-qpr-dev