update to 2.1.1

Change-Id: I447df65cf9fc73976fc9a8f4c512f37307dfd2e8
Merge commit 'refs/integration/team/platform/dev-60'