Reopen code 7.1

Change-Id: Ic684dd217028a86fc2de1168ae21e0b3b21a8645