This CL didn't ship with diamond-release, but will make diamond-mr1. This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15. Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b
This CL didn't ship with diamond-release, but will make diamond-mr1. This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15. Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b