Sync with exp_codeaurora from cb93e880ce6c0411127cbc3b39a1fe5ab7cf622e to 43c515720ea5bc5de49dad9a62fb00c154710985

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>