Bug: 20294239 Change-Id: Ic770a223c23013ebab08d22dd14e7192dc8e3109 (cherry picked from commit 735a31e0)