update darkparanoid branch

Change-Id: Ibfa2f1ad35b4f69cb09c1614669925dda343c1f3