track native for master bugfixes

Change-Id: Id42863d2bf3a153b2d7de01f84bd775699198f05