Make current

Change-Id: I638f84cbf1a839d8ade0ff2d62c0a85fce6af747