Merge "Fix typo in change marker." am: 3006a46864 am: 2b20cf9ed8 am: f66b5a042c

Change-Id: I18461e7dda22ac010c0ba95a6a196fdb47e0c494