android-5.0.1_r1

Change-Id: I046edf82b57cbfef2b5a1544e06ba0ee2214d408