pulling changes from aospa-legacy

Signed-off-by: Andre Saddler <dresadd09691@gmail.com>
Change-Id: Ic6a3fa2950aac3596c5547c9811791bbcf2ebe33