No functionality change Test: runtest frameworks-net passes Change-Id: Ic3977eed9a86deb76ef0e4e12ffa17597bdecc30