Issue-id: YAM-69 Change-Id: I81ea039a7444d3db5d97b1d798bffe9a6b8ec498 (cherry picked from commit 15b7c92faa)
15b7c92faa