Add Some Buffer Lines to Avoid Merge Conflicts am: 1fd6b723df am: 68bd27a397

Change-Id: If316a397c9ff98ef9ee5d89b78949643f104c8d1