Merge release 0.9.8.1 and 0.3.8.1 into neo

Change-Id:Ic2684ecb49a121ec67d8b597f54e1b5ce35c13c2