Placing the _Lx markers back into the code. No other cleaner solution has
has been implemented. Patches will be submitted in a series of sub
directories and in a fashion that is manageable.
Partial-Bug: #1384312
Change-Id: I62c708036a9cd5da431b7a95e9cd41167fb5273b