Proprietary yak shaving

Change-Id: Ia01b40630a822158a50fe66d46250559aef10c95