Bug: 17325091 (cherry picked from commit 7adb7ac3) Change-Id: I343099543ce0abf02219da84d61d9ce2dfc47980