BUG:19270126 Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea (cherry picked from commit 89a2466a)