Bug 12991134 (cherrypick of commit 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a) Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367