Merge "Add text attributes to Wallet manifest entry" into rvc-dev am: 4fca5e9d am: 9ec1055d am: da4646b2 Change-Id: Ideb22164a5b4dea214b686591574bb209ec66a86