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

Change-Id: I7dd23af7452ed9836fb26dad0d7774ce9aef1c36