merge: changes from github/master up to 56733b50c563ecb6f3430d8f07a7cd436e3ac992

Change-Id: Iae64325c6b12ae17ae7d97d414097bdd0b8b716b
merging gerrit/master

Change-Id: I5ca720380fa935b5ea33c7812d906b681ba2c034