Bug: 34673753 Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2 (cherry picked from commit 2e11adaa)