Change-Id: I875c149a71b2faa34ae4882043bc61f2bcc82f07
mentioned in commit 9facbb59
mentioned in commit c06d809f
mentioned in commit 49ce960b