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

* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
  This patch addresses the following issues: