track from aosp and slim

Change-Id: I99ca169755f413e035143039701ae56c4723ad77