(cherry picked from commit f64386fc26) Bug: 10600582 Change-Id: I88dfcc8ca602f55fad54bd8bf043aee460c0de24
f64386fc26