Add separate lazy service target to cas am: f646be06ed am: 17763ce064
am: 6cef60283a

Change-Id: Ic1d12f6ffbf56e1baaa3aeea2db8243f26256fbd