Bug: 29873669 Change-Id: I68c11ab19a169498045bbc23bc8fe6a2f46be031 (cherry picked from commit 43e235c0)