Patch contributed in: https://code.google.com/p/android/issues/detail?id=182908 Bug: 23290056 (cherry picked from commit 4eeacbeec0) Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b (cherry picked from commit ebabef2752)
4eeacbeec0
ebabef2752
Change-Id: I6cf4268599460791414882f91eeb88a992fbd29d