5.0.0_r7 -> 5.0.1_r1

Change-Id: Ifb29821a89711fc8843a6cf060bdb4c77cad40f2