Updated to latest masters

Change-Id: Id46d9ba05c769c285863befd3e27269c8cee7ef1