Merge "Revert "Merge c80340 from master to r13: Move charmap to hardware properties". do not merge." into tools_r13