am 0a1b9dac: am e64eccb6: Merge commit \'d2346cad4215e2a5c50f7fd7d6d3f46c80286330\' into HEAD

* commit '0a1b9dac7b826cea78189d45959aba156ee4478f':