M20170212-0800
backport to 4.6.x branch, original commit by Stefan Xenos <sxenos@gmail.com> Change-Id: Iff29aebed516daee8028e3872199e98c5becc72e Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
backport to 4.6.x branch, original commit by Stefan Xenos <sxenos@gmail.com> Change-Id: Iff29aebed516daee8028e3872199e98c5becc72e Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>