[Fixed] some accidental file reversions

Change-Id: Idb5e0853fb33499c8c9928694a8006ce73c18243
Merge "[Fixed] some accidental file reversions" into unstable