Bug: 20346301 Change-Id: I10633705f2bfddbdeec063f9489a4f8679b9e8ee (cherry picked from commit 64375180)