Update to 2-1 Change-Id: I267f253a20791799b6f0df957794e95a3ab0ce8f (cherry picked from commit 7aa2f013c48f70805f751574c23cad5f01e77459)