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