Signed-off-by: Sarath Subramanian <ssubramanian@cloudera.com> (cherry picked from commit 6d9292d1d662e688cd4c87efafc7611e273960a9)
