Bug 23186545 Change-Id: Ieb03ba89db2dee0365ae346295207ddfd29bd2b7 (cherry picked from commit 297991b324)
297991b324