merge in old CLs to new jd files

Change-Id: Iee99364f6a99270fee5f4fdb766ec39fb51a74d1
10 files changed