Merge "Update to 2017a." am: 2ca0abc8de am: eeca6add23
am: 2fc77f78f5

Change-Id: I52889a24c3a81875d6e26897034634677836e426