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

Change-Id: I0a6dd7f5cef6f7f3634413d012c8f1c84c807aac