Merge "Do not set properties in bionic_systrace"
am: e46ded5ce1

* commit 'e46ded5ce1582202cb809c907128e423e58ce7ed':
  Do not set properties in bionic_systrace