Merge "fix related to bug http://b/issue?id=2101719"