am ddb70678: am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"

* commit 'ddb706785bd96fe7b450779ab41d1276939ee9fa':
  This patch addresses the following issues: