LP1285766, LP1287426, fixed Savanna xref

Change-Id: I2f42f3250669249cc6a2f982c546806c851fa782