Jan 20 update

Change-Id: I155dfa8508b66b4dd275d97e3ad036175899999b