v500 Adeed to NIGHTLY

Change-Id: I7853019806c10db3b0508d7e687c93ccf0a2b24f