There are now two 0007... patch files. So renaming one to 0008... Change-Id: I82ab883db3436b1fce6b169065b257df052fe63c Signed-off-by: John Lo <loj@cisco.com>