Bug: 62455338 Test: m -j This reverts commit d1abeb9d98. Change-Id: I9f73031636157511b5f1c6ce8a205e9bc91669ff
d1abeb9d98