Changed aospplus branches

Change-Id: I9a4be6b21bf763dae2bc5730daf9daaed737519d