Merge "Remove unnecessary restorecon." am: f896d274bc
am: a55ca79ba6

Change-Id: Ic238172695860186a923c157c4a17ab58d7f381b