Fix root

Change-Id: I3418f274f350d1ba634c630bfc2bdcb4e5a41d90
Merge "Fix root" into lollipop