5.0.2_r1

Change-Id: If8b18ed2f502e518605b6fdb0b09917e685eed14
Signed-off-by: iceandfire <arhamjamal@gmail.com>