YARN-1172 v3

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>