Final fixes before next update.

Change-Id: Ic8de76bfec7c458924c58f33311e96b4acee481c