fix cherry pick derp

Change-Id: I651255c1322189544045156347ab0c750a9311b0
Signed-off-by: zwliew <zhaoweiliew@gmail.com>