Merge of aospa-legacy/vendor pa, at beta 3

Change-Id: I043a5af22d1fe9e77fdbe7d85bc23517fa89966a