Restore 0f3e4da9 for jss15j release

Change-Id: Ib2f164c37a380b4d46964dcb5b495bdf66958af2
26 files changed