Shamu squish from N6-Dev-Team

Change-Id: I9ed430d703121cef0c038057a775ba0766d68bff