Updates by Xonar_

Change-Id: If632e2cef9569947e989cd20f313290e6df86d02