Pre code freeze build.6

Change-Id: I7c84709c50b44b08bfd9f5920aa6612f2e342b7b