Updated for next release

Change-Id: I45de5759a07184c193d9b4addbb2f34538d2deee