5.0.0_r7 -> 5.0.1_r1

Change-Id: I45a6637e39df749b0ca6162e96f66660d1a2521a