Update for v1.1

Change-Id: I014ea0872ce5ab26c9fd934f1192c57234f851d2