tyrus 1.6

Change-Id: I8281fa38051c5b0754765b8f93b3359c712e543a