android-5.0.1_r1' into HEAD

Change-Id: I3e23f320fff44df604065a900f379c177e99d424