cherry-pick of aosp/1959811

Due to bigest topic on aosp, the cl has not been merged in internal
This CL is only to reduce merge-conflict between aosp and internal
Test: build

Change-Id: I47edabfbcbd2eb15650194d6234f54c16d74ed07