Added Note II stuff

Change-Id: I845852ff8b672d62d6a03ff83009f88a7e69878d