Add/move full-stops

Change-Id: I5b66984f1ab5b3c549eb980d3e7c9ee49a171389
Merge "Add/move full-stops"