Signed-off-by: Brian Swetland <swetland@google.com> (cherry picked from commit b1042b9595)
b1042b9595