merged attn1 repo changes

Change-Id: I901eadc41154ca0095a77354255376c800c94bc8