Reopen for build.5.1

reopen code go ahead guys

cheers

Change-Id: I7f16a223e70ee60f1244f190e4949c127bf2b69c