5.0.1_r1 - 5.0.2_r1

Change-Id: I140385981354696e57a6147ab178cb39258fa65c
Signed-off-by: scott <scott@ubuntu>