Frank's commit
Another change
Replace all $ with John Doe
mknauer's change

Change-Id: Ie3fd6961ca3ea8bbb7e0510203d3077758f87879
Merge commit '2a272637edd71a27c173bc78524afca8f3ae76a9'
Merge commit 'efa2737314a19be9f235d4f148d03a4138cfbdcc'
Merge commit 'bdf19315c5156d18b0545957f576d647adb0bcc0'