Bug: 19358804 Change-Id: I38a53ad64c81d0eefdd1d24599e769fd8a477a56 (cherry picked from commit 40a8f214a5)
40a8f214a5