Merge "Remove conversion from dollar sign to dot"
am: 8a549765b2

Change-Id: Ic46c8d9b344e86f521aee97ca34c6b4be7ebc81c