Android R Beta 3
Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2

Change-Id: I87348a0d218cfd407f29b13a16262b4eded0c7f4