Merge "ART: Improve IsValidMemberName" am: 350b6a3122
am: 890bfd2c77

Change-Id: I4ac676a757ebdd566ef3d3e75fd1e1f03c5914b5