Bug: 18027433 (cherry picked from commit 6a4d2369) Change-Id: I08b4e7172cd66c9006c26f07e3399848999cd74d